Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 18 Feb 2010 13:20:39 +0000 (14:20 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 18 Feb 2010 13:20:39 +0000 (14:20 +0100)

Trivial merge